Added support for callbacks