Added changes as requested for the new schematic support.

Will close the other PR... I had to redo my git base a bit :) Hence the new branch (from my side).