Update to work tables api