Add support for Hql