Added more helper classes and set up ready to build the framework