Added simple table wrapper