Added ref update management