Make XmlDeserializer class generic and add non-generic class