changes to factories and bookstore classes