Change autodetector changes API to be just one method