Continued work on NameManager