I do support heartbeats now