changed list to hashmap for message handler class