Adds Gateway model specs
Merge branch 'diogob-gateway_specs'