More Model adds and changes