Added minor reference tracking