Made component source interpretation work