Changes to CLI add