Smart table even smarter (and DRYer)