Modified to use new library names