Some work on index updates for GenericObjects