Added table support to parser