- Improve identity selection
- refactoring code