Added parametrized case class support