Removes cast to String on channelName
Changed map to store int