Add auto-detection and selection of valid architectures