Updates for new Format class (replacing FormatUtils now depricated)