Fix up export and modify with collection_point