Setting and config enhancments