adding local settings support