Use CallbackWrapper instead of handle