Even more structural revisions