Improved import/export functions to include styles