Updated ObjectModel