Small comment fixes
Improved mor config models. Changed the configuration from the config array to SystemConfig class.