Add map and minus changes