Porting to new components callback api