Change in missing base entry method
Merge branch 'development' of https://github.com/dputtannaiah/rvidi into development