Renamed GeneralModule to AbstractContextAwareModule