Added needed XmlRoles and two related TODO entries