NationalSystemId moved to level