move to keystone v3