Feels like we're not using the right pattern if we have to sub-class it, to add some additional config. Not sure if it should be another arg in an overloaded constructor or something else; haven't dug into this at all yet.