Add generic id field.
Add separators in spec.