Update UserLocationAgent

This addresses #490.