Adding support for relocations