Security enhancements

Reply to Security enhancements