Add HM 12.0 support