Updated entire map structure to new aspects