Added location field, shortened fullName