Modifying PR to keep current CLI arg structure