Recreated QueryHelper.java