Wip/update libraries