Improved Security module and StoreCredential tool