Allow bucket to be specified in main config