Update to work with changes in ComponentSystem