Some changes in map