- Add base for top management
- Some minor changes