Updated Hawk support