common: Changes to common code for gateway support