Several changes in the library