Upgrade to the new security pattern