Modified match export object