Update command line classes for MokaUtils.py