Basic references functionality
Fixed merge conflict