Added DNRY to message types