Add table and input validation