Got rid of TypeAttributes.scala