Changes to work with the Reference class.