Complete Callback Improvements