changes for Base repository and dbcontext duplication error