Code refactor, because LibraryManager was a mess