Changes to automatically load the files