Added location autodetection