Adding some provisional reference handling so it's not always such an eyesore