Update order of callback execution