Add export and event attr