Changing of organization of the file a bit, added message transport informations, more identification attributes