Feature/book dispatcher refactor