Moved to Query.java to Query package