Added mac variations and auto-detect