Refactoring API...