Fix Gender class
Add output case class