Improve books data generator