Add metadata as fields