Refactoring the LibraryModel (4)