Removed entitysystem.systemId in favor of typeId