Improved BookStore project