Expanding the object model to incorporate the spec more fully