I'll probably end up doing the same. For now we're just duplicating things in two places.