Added automatic Supplier formatting