All callbacks are modified according to new API