Refactored service definition builders
Updated documentation