Smarter location binding