Add proper cgt6x and fc components.