Cleaning
Improve callbacks
Improve errors/failures reporting