Adding delegation token support