Feature/add table class