Added new serverScope and identityScope maps