Move callbacks to the proper location