Update to references and monetary values