Be more flexible about accepted formats