Changes for cmd style syntax