Import/Export Update and Bug fix