Improve Book model