Updated XML version of setup