Add support for callbacks without promise object