Better Makefile support