Added support for more dash types