Adapted to renamed library