Changed to use the 'kind' parameter.