Refactored callback interface to end-user.