Fixes given merge of module work (new structure for IDs).