Add option to calculate HSM adaptive moments