added service interfaces and changed implementations for services