Slightly enhanced cli using Commander