General table concept, lots of reorganization