Fixed issue with dataSource definition