porting to new Component Architecture