Updated data models and other updates