Made model class to case class again