!cam Splitting up case class as workaround for SI-8283