More proper heartbeat events handling