Storing location objects and returning an object instead of just an ID