Adding conditional support for local settings