Simple API refactoring