Updates to references and schema