ISPN-2425 Amend the xsite configuration and the xsd