Adding some missing components.