Fixed DataSourceReader base and added CSV Reader
Missing changes pushed