updated class names and removed PortalProfile argument