Support metadata section for #352 which is now considered to be done.