Allow more to be configured