Added configuration template support