WIP: adding dataSource entity and associated logic