Refactored Security Aspect