Add mixed parameters on(...) callback
WIP annotations