Added hsm check