Better custom message handling