Converted commands template to new format