added EntityGateway namespace