Continued refactoring ReferenceMap class