Adapt relocator to load new tables in 2.1