old iam references replaced by token references