Add inner component support