Update to work with latest Schematics