Updated location model