Added formats up to 22 fields