WIP:Completing library dependencies