Add hyphens and digits to group regex