Updating: supporting ATS_STATIC_PREFIX