Removed duplicate 'kind' extraction