Updated commands to use new format