Added location and name fields to val().