updated to Object Model