Add CSR support and a subset of the CSRs