Major Changes to Storage.java and Config.java