Add new table and fixed the input problem