I'll take a look if there is some unification possible.