Added more code to handle Books