Merge branch 'api-refactor'