Implemented services to pass test suite