Small CSV adaptation to the new data layer