Add HH6.x compatibility without sacrificing HH5.x