Updated exporting env variables