Fixing how `Promises` are handled within `client` & `data`