Added initial config functionality