Refactor - make file fallback more obvious