Added some more formats