Some staging changes for models and data