add more case classes in Helper.scala