Changed underlying Message Component storage to Map