Change keyTypes and add resolvers.