Change API
Refactoring