Add support for HQL select query