Added a generalised table infrastructure, so that we don't have to