Full port to the new library.