RCM Security Enhancements