add universal system support