Tweaking main files for persistence