Adding missing components.