Update to abstract table gateway