Cleaned up ReferenceManager class