added worker role and refactored service entities