Changes to make sure that referencing was setup correctly