MOre work on HQL Query builder