Xml parser changed, models superclassed, data parsing fixed