Even more references and structure