Improved entities Book and User and simplified services.