Changes to allow for portable config (e.g. setup scripts)