The gateway is not clearly defined at several levels.

First, it is not clear that we a solid message/definition for what a gateway is when dealing with external entities.

Second, in the domain model it is not clear what the gateway class is intended to model. Originally it was a representation of the current running software stack or other instances. It now appears to be anything that might be a server, such as an OAI server even it has nothing else in common.