Add support old callback format