Updated with new config options