Refactoring the lib.
Adjust to the refactored lib.