Updated class definitions and Makefile