Improvements to the format for model objects