Refining Location model