Added hrm compat