Change DataSource to return T rather than List of T