Better support for local configuration