Added GNS and identity service stuff