Reworked references