Changed to object model