Makefile updates and Map as a first class