Client refactoring + using CompletableFuture instead of Observable for single value futures