Controller refactor with CountDownLatch