Added system id handling and json-settings-file