Decouple TableGatewayInterface from MapperInterface