Added table support and removed obsolete dialog input fields