Modify makefile for new features