#781 - invert and simplify service dependencies for customer models