Add new location selection mechanism