Updated map to include more data