Add support for Location model