First pass on component support.