Work towards improving schematic system