changed back to mapped_collections