Updates to timeout logic for heartbeating purposes and subscribe/unsubscribe for tag patterns