Update main-class to use Tbdata2