Further work on refactoring of library