Refactoring SecurityService and SecurityAspect