Changed to new configuration API