Added support component support