Changes in API, refactoring.