#7 Support Aql2Hql