Added table and form