Updated the framework (mostly debugging tools and class inheritance)