Updated table class