B2G specific changes