More fixes
Add much more formats