Added location settings and model