change API signatures to support GLOBAL app and NORMAL app at the same time