[Book][Schema] Refactor according to last changes
Merge pull request #5 from egeloen/f-schema-manager

[Book][Schema] Refactor according to last changes