Generic components

it is confusing that the response looks different for the generic case. I think the format should be the same.