Refined the object model