Added gen-tables