Made better CLI