Add basic CLI handling