Added / modified Csv classes for the incsys model