Update generate command properties
Restructure command options property