Adding some features like improved secruity options