More changes on libraries