Changed output to use config name
Added template