Added many, many more ways for references to be included