Adapted the library to the latest library changes.