Update to return promise array instead of array of promises