Switch to paramterized class