Updated component selection