Added better formats