Improved HQL syntax