Refactored security settings