Switching to optimistic dependencies