Added service & basic query object