Adds location-update check + neonSupport check