Add missing component keys