Added Castle, added Gadget in XML