Fixed an error in DataSource where raw types were being used.