Add in logic for the shortened_identifier