First attempt to make datasources modulary