Add implementation of service query