Refactoring the code in various places to accomodate for the new schema validation for library entries