Implemented map (locationMap) & Log update