Added Id and Type.