Add support for HQL