Added "onToolbarClick" callback