Working on API refactoring.