Security actions refactoring