Updated Makefile to reflect the latest changes