Removed xml support - probably not needed. Added back our own struct so that the internal datastructures dont affect the front-end api.