Add component support