Added autodetect