Small improvement regarding IDs