Add more component labels