Creating an improved datasource