Enhanced spec.
Now works with new format for data file.