API design changed. Refactoring.