Changing the callbacks organization