Improve Add Reference behavior