new setup.xml handling