Clean up DynamicObject order to be easier to maintain.

Also turns out we were missing model proeprties in the constructor.