CLI parsing improvements