Added component.o support