Restored autoconfigurer functionality