Not sure how hard this might be, it might require some changes in the HQL parser. Maybe this should be two separate issues.