Wire callbacks in separate functions
Relax dependency versions