Added joins to the TableGateways combined with mappers