Add old data location fallbacks