Updated Dependencies
Fixed callbacks