Promises refactor for specific app