More book structure changes