Upgrade to RSA M2