Adding output=png support