Refactored service implimentation