Refactoring, API change.