Update to use new components.