Create more accessors & update object models