Add id and identifier column. Fix parsing bug.

The ids are just sequential. The identifier is meant to be
a human-readable unique identifier string.

The parsing bug was skipping some classes because they had a - in their
name. This fixes it.