Added property to disable heartbeat message