Small refactor in configuring the SDK