ObjectModel changes