Adapt to newest changes.