Refactoring security.