Updated component lookup