Enhancing the data model to be more production-like.