Added support for schematic loading