Reused element injection code
Updated element injector
Added pageElementValueRetriever
Updated table