Improved MessageTypes spec.