Added separate default and user configuration options