Added Service implementations and fixed entities.