Added -NONE- types. Ensures that xml is built correctly.
Updated output