Add some CLI helpers