[Book][Schema] Refactor according to last changes

All is in the title :kiss: