Updated component and Makefile