Added sub component classes.