Added simple table support