Changes for using a enrollment webservice with s2