Added initial settings support