Added map keys to metadata