Add support for callbacks