components updates for 2.5