Added and removed some metadata fields that are coming in from POMS (BNN-26)