Some blahblah
CLI enhancement