Added dash compatibility