Updated to latest component system.