move classes to parametes

My Override in #708 would have been easier if the classes were stored in parameters