Enhance messages