Working on the data source, implemented the count, which is important to get update working as well