Refactored library.