Added classes for importing and exporting