Now using global config structure