Improve support for the default `nil` configuration as well as adding additional store configurations.