Modify export method