Removed handleing of IdInternal and replaced it with ExternalID hadleing. Closes #317