refactoring
fixes
Optimize adapters refreshing
refactoring