AppServer PEP changes