Raw objects now included in exports