Add support to new callback class