Tweak XML and add services