Adding more to CLI