More conversions to MessageBundle