Add missing components #717