Configuration and doc for new config options