More work on metadata.