Updated schema and added better makefile.