Add support for IDs on relation targets