Refactoring
Change API