streamlined cell parameters into single type
added component classes