Make sure that when you merge this, please document how this works on the wiki and add these fields to the sample config