Fixed new Table Structure