Adding support for dashing