Improved tables implementation