Refactoring callback structure
Refactoring callback structure