Fix api refactoring