Lokesh, Manjyot|Refactoring of DbWrapper and E2EInitiateRnR