Baseline protection Enhancements