Made hyphens optional