Add more optimistic updates