Adds local settings support
Adds local settings support
Commit