Added component support