API refactoring : flow