Tweak setup to allow external files...