Update to work with latest component/stack.