#26 config additions