Handle a few more formats