Updated inputs templates and makefile