Created better object model.