Update metadata spec to cover nil keys