Improved tables structure