[Book][Platform] Refactor according to last changes