Added and integrated table class