Implemented the mocking system for current services
Undo changes