Add some support components