Use CompletableFuture in service
removed unnecessasry layer