Add dash support
Remove todo