Switched to new component model.