Misc updates to model