WIP: Zone override check and automatic token refreshing