Added more fields to Location model object