before implementing Query Service