Added Id and an exported struct