Adding support for machine-local configuration