Changed to case class