Add simple table support