Added composite key and modified the makefile