Add back in parent collection support