Add support for ID mapping