Added automatic selection based on the OS