Change internal metadata to 2.0 format

Fixes #155.