Improved referencing