Refactoring the LibraryModel (3)