Few new config options, need to implement 2 more