Added additional comments for the Map components