Update formats to include edge cases