Adding support for class parameters