Updated all cmd methods to new format.