Added support to Hirefire