Begin of refacturing to accept new export file format