An Enhanced Data-Driven Architecture