Adds support for Hql