Replace old location and latency management with cleaner and easier to use design

Replace old location and latency management with cleaner and easier to use design #631