Add support for gateway_specific_fields

Closes #36.