Few changes to use a different settings config