Added nil datastore tag on XMLName