Made seamless integration between base classes and the module