Add some more CLI helpers