Adding refactored library.