Updated Api to use more DI - added Occupation support to service