Bugfix with saving optional data of new entries
Major overhaul of logic related to configuration files