Refactor2 - Change api generation