Changed to use new CSR format