Added support for non-field class params.