Added Entity Query Service and tests