Adding linked container support and set keys as appropriate