Updates for PEP compliance