refactoring, simplifications and additions to data provider and registry
removing old repository message
again refactoring