Refactor Security in progress...