Add missing components from last commit