Removing KeyName parameter, moving it into the provider