XML tags and user-def constants updated