First security enhancements