Converted to a provider to simplify configuration