Add preliminary settings support