Update makefile and struct definitions