Improved anchor referencing