Refactor in CallbackWrapper