WIP: Add support for linked collections