adding csv parser & adjusted data model