Added posibilities to output a table or a list