Updates reflecting internal changes.