[Global] Simplify Messages construction