Working on Dorian/HSM migration