Add classes to match Distribution.xsd structure