Bring data definitions up to speed and add persistence interfaces.