Api refactoring completed