Replaced old CLI syntax with the new one