Add table support