Changed object to require location and query to initialize