Update identifier methods to work with timeouts.

If an identifier doesn't have a timeout, it will be considered
as invalid.