Better match output format specs