Add support for a couple more formats in champ