Migrating from genCMD