Updated references to used libraries