Endevor Table Change from v17 to v18