Updated object model quite a bit.