Added XmlContext
Removed unused usings