Changes to security improvement

Changes to security improvement