Now generates datasources that update themselves