Add table support, and license update