Reworked References a bit