Can we do away with `collection` and `resides_under_marketplace` now that we have type data on returned data? /cc @mahmoudimus @bninja