More work on SetupHSM