Implemented new feature for security and localization