Bringing messages up to spec