Add a wrapper around tables