Changed export method