Fixed serialization issues - XML still needs a little work