Added support for callback