Add expired token support