PWA-7 improved csv reading