Map  added.
Map keys refactored.
Map activity reformed.
Merged.
Merge