Adding the module concept to the framework