Initial porting to the new component API.