Allready added more rellocation support