Compressed Sparse Row Matrix handling added