Changed to new style config