Several maps have been changed and renamed
Refactoring and bug fixes