Refactoring
Refactoring to new Api System
Fixing