More changes for new library