Add supprot for non-promise returning results