Updates for new id-service