Add support to Hql