Separate FileProvider aspects to KeyValueProvider ones