Improved syntax and dash support