Updated makefile to add additional wrappers