Improved organisation and details of libraries