Move callbacks to dedicated file