In particular it seems we should use CompletionStage instead of CompletableFuture in our APIs. There may be other recommendations, I still have to read a document that was given to me (internal link)