small refactoring for new system identifiers