+ Changes due to adding Component type