Made the CLI runnable again