Put CountDownLatch somewhere better