Added missing id types.