Updated examples to work with new ID fields