More PEP compliance