Updated component support class