Add hyphens support