Modified the table creation, node table not complete yet