Adding support for local configuration