Get rid of those crazy (Option[Group], Option[String])