More security additions