Updated with new library versions