Working through adding in circular referencing support