Added automatic discovery and operating system templates