- added maps
- refactoring