Improved heartbeat message