Gateway

This section describes the changes required for Gateway.