Changes based on the latest security enhancements