Simplified the types of the table EDSL.