Switching to a collection based response

This allows for potential pagination at some point.
Removing targets from tenant information