Initial version of PM query control and service code