#37 - Added main table