Refactoring of APIs