Updated generic return of Format