MSINM-159: Added support for composite parameter types