Added support for Location property on Model