Changed to use nested parameter element which is more flexible