Add new version of EL Table into the fray

Change-Id: Ie6d959e963f0708464cc561377f39eb0ba52f9d2