Port to new value refs