Use now Convert functions for doc also
Update to last library version