ADd the return type for callbacks
Update the enesim definition