Better location handling