Adding Component Class Structure